From bd55519f7e6bb5da2fdf6f5e99bd79213059f81b Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 20 Mar 2012 02:04:22 +0100 Subject: [PATCH] gdk: A TOUCHPAD device behaves like a mouse and not like a TOUCHSCREEN. So treat it like that. https://bugzilla.gnome.org/show_bug.cgi?id=672009 --- gdk/gdkwindow.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 72f0a18ee3..4ae08ca850 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -9271,7 +9271,6 @@ proxy_pointer_event (GdkDisplay *display, if (pointer_info->need_touch_press_enter && gdk_device_get_source (pointer_info->last_slave) != GDK_SOURCE_TOUCHSCREEN && - gdk_device_get_source (pointer_info->last_slave) != GDK_SOURCE_TOUCHPAD && (source_event->type != GDK_TOUCH_UPDATE || _gdk_event_get_pointer_emulated (source_event))) { @@ -9682,8 +9681,7 @@ proxy_button_event (GdkEvent *source_event, * which synthesized a leave notify event, so synthesize another enter * notify to tell the pointer is on the window. */ - if (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN || - gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHPAD) + if (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN) mode = GDK_CROSSING_TOUCH_BEGIN; else mode = GDK_CROSSING_DEVICE_SWITCH; @@ -9743,8 +9741,7 @@ proxy_button_event (GdkEvent *source_event, (type == GDK_TOUCH_END && _gdk_event_get_pointer_emulated (source_event))) && pointer_window == pointer_info->window_under_pointer && - (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN || - gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHPAD)) + gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN) { /* Synthesize a leave notify event * whenever a touch device is released @@ -9780,8 +9777,7 @@ proxy_button_event (GdkEvent *source_event, if ((type == GDK_TOUCH_END && _gdk_event_get_pointer_emulated (source_event)) && pointer_window == pointer_info->window_under_pointer && - (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN || - gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHPAD)) + gdk_device_get_source (source_device) == GDK_SOURCE_TOUCHSCREEN) { /* Synthesize a leave notify event * whenever a touch device is released -- 2.30.2